Cleaning the code a bit