Fixing logging bug
Misc style changes