Cleaned up classes and Implemented #35 drastic logging improvements