more cleaning
unit tests done