cleanup

- splits variable into the function
- comments