Clean the code a little bit