Fixed some syntax errors I created by refactoring.