Housekeeping

Cleaned code
Removed redundant functions
Moved more functions to debugging.
Merge pull request #1 from Shane-IL/Laptop

Housekeeping