removed comments, cleaning