Fix braces style and naming conventions where it left