added comments, removed extra method