some refactoring & naming consistence among other projects of mine