Changes #define constants to an enum
Removes duplicate comment
Updates to SRP/MRP for single port implementation