code cleaning
all tests are green