Removed unused ButtonListener class file.

Cleaned up code for the other class files and fixed spelling error on coments.