Cleaning Up

Clean up debug message and improve class name