Clean the code and make it more clear