Tidy up

Signed-off-by: Gray Remlin <gryrmln@gmail.com>
Compensation and Exit rework

Signed-off-by: Gray Remlin <gryrmln@gmail.com>