did some code cleaning