cleaned more stuff - handin-ready