Removed Logging class. Not essential
Improved comments and @todos