Update code to follow conventions