Bit more clean up. Massive code reorganization coming soon