Making it look pretty.  Also some minor housekeeping