cleaned up code

it's cleaner and more modular yayyy

hi.