refactor
various style nits