Made small changes to the structure.