- Fix closing statements