Refactored code to comply own standard.

fixes #11 
We still havent decided about this type of comments so leaving it as is.