CJ's Pull Request - Style Stuff

Pull request for review of triangle facts and robot name style related refactorings
Also, fix this :D