refactoring to remove comments extraneous