Improve code a tiny bit