Cleanup. Fixed [] {} errors