Continued refactor of Competition.cs and Controller.cs