Cleaned up the contents a bit.