constant values and code cleanup