Clean up and refactor the code

[fekberg]

The code needs to be refactored, the method names and variables should correspond with the C standard.