Code cleanup: constants made private