cleaning up logging statements, tabs, and un-needed code