updated structure
code structured nicely