Refactor; more clearly