code cleanup, moving constants out.