Clean the code for more visibility