clenup a bit more