Cleaning the code a bit before goig for the last feature