Coding style refactoring.

All conditions or loops involving a single instruction
are now enclosed through curly braces.
Set DEFAULT_LINE_MAX_SIZE to 24, instead of 16.
Update TODO