Clean-up

- Organized file