- Fixed Formatting - Cleaned some hideous code