Moar clean up and created a couple helpers for the ore dictionary stuffs

Signed-off-by: Captain Shadows <captain_shadows@aol.com>