Minor fixes to match coding style
Moved protected method to bottom