Move some closing brackets & braces