more code cleanup
more code cleanup
Dat orb