Cleanup up a bit