move constants to dev.ini, code cleanup