Beautified code with UNCRUSTIFY and G++ -Wall