Changed code to be compliant with the code conventions (mostly inspired by
google's code conventions).