Code formatting mainly (and comments fixes for future usage).