Improved coding style, fixing #21 #22