refactored, linted, squeaky clean