Working on the logging info
Cleaning up class descriptions and logging