commit some refactors