Fix method arrangements within classes
Minor fixes (typos, style)