Removing more duplication in statement
Charlene: Abstracting statement formating into Statement enum