hmmm formatting and smell refactoring