Refactor to MAX!

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>