A little work on making things prettier