javadoc
Don't double scan
made it easier to read debug comments with a bit of indentation