Cleaned up formatting and removed un-needed code