bit more cleanup + introduce HW4