Improve performance a bit