Update and Clean up

Imo this is worded a bit strangely right now, however I don't know how I'd reword it. :P