removed comments and useless scopes