- Restructured code to be easier to work with