Changed formatting and fixed a bug in response to Kripken's
recommendations.