reworked code and cleaned house