I fixed all of the spacing issues but I'm not in love with that I did in this file with assertion messages like these. Any suggestions, @pmclanahan?