added some constants and renamed some identifiers