Move curly braces and remove closing tags to accommodate PSR-1 and PSR-2