Clean the code and organise them