more code cleaning

commit