cleanup fun code
cosmetics
cosmetics... still
wip
cleaning up
wip