Reorganized/removed bullshit

kk