Cleaned up the formatting, and because of the package better-defaults