improve things a bit