remove unnecessary space
add small step evaluation (yet not complete)