cleaned up code, adjusted font size for testability