Display friendlier error codes that match the remote monitor
Code cleanup