cleaned up code and formatting