addressing formatting PR comments
refactoring per comments from Shea