Sri | Overlord

refactor out case statement