minor fix
start refactor