commit initial
refactoring