refactor #16

Closed jaredphantom closed 8 months ago