Code structure updated