removed comments and removed lines