Refactored -- removing unneeded comments