Clean the code a bit