flameworkified it
cleaning up a little