small code refactor
small code fix
new printing