more cleaning up
adding some feedback