change code to follow conventions