Cleaned up the code and switched the font