removed comments, small changes