Updated space usage and brace style