made changes as grant suggested

just simple clean-code changes