Update code style to conform with rest of library