Improved Functionality

Cleaned up old code.
Made things more readable.
Removed legacy style elements