Re-factor

## TODO
- [ ] Make a TODO list here.