(maint) Fix code to follow style guide