removed comments, code cleaning