Move normalisation to actions instead of post-action processing

Signed-off-by: GreatEmerald <pastas4@gmail.com>