code cleaned, constants organized