More clean code.Removed unnecessary classes, standardized code.
Cleaned up code even more.