Went through and cleaned up all files