[FIX][IMPROVEMENT] | Fix some minor issues and add an operation enum
[FIX] | Add break statement to prevent subsequate cases execution when upper one is met