Closes #172
Fix whitespace
Move private method after protected methods