Beautified code with Uncfustify and G++ -Wall