coding conventions: changed names and moved constants to constants class