removed unnecessary @ tags and comments