made things DRY... hopefully
made comments changes to be more DRY