Cleans up code a tiny bit