Exit codes cleanup