Refactoring

Refactored the code stripping away needless junk.