Improve code and messages to look better formatted and make more sense.