commit before minor refactor