Smoother left/right movements and clean up