corrected some things according to my code convention