Code cleanup
Fixed class name and usages
Centricity is now fully functional