organize a bit more.
Bit of cleanup. Not happy but I'll live