Remove chatty comments and fix some others
Remove unused debug constant
Fix code style
Remove chatty comment