removed unnecessary comments/code