Updated names & changed buttons to clear
File cleanup
File cleanup