Just a little bit of cleaning

I just rearranged some stuff Thais did just to improve the readability a
little bit, no changes on the logic/mechanics