second commit, code cleaning