Move methods with more than two lines to outside of class definition
Small improvements