Checkstyle corrections, Pawn
A lot of checkstyle correction and a merge conflict correction