Emily pushing GRADER and slightly cleaner code.