Code cleanup. Added Enum type for cactus calls.