Update: Major Clean up