removed/added comments