Cleaned up a bit prior to presentation