Minor stylistic changes, thinking about how to refactor update