Improve code just a little bit