Removed code cluttering and fixed code formatting settings