removed + moved comments