More consistent use of make; start to refactor the Controller