We cleaned the code a little