refactor

Small changes.