Enhance the structure of the code