Some more formatting and fixed missing closing Brace