removed some constants and put them near to classes