Modernize and clean class
Move functions to their 'correct' location, use auto, use simple commands, correct comments, remove unnecessary code