couple small notes for refactoring