Code cleanup
Shouldn't have been removed
Changed the format to be more compliant with TT