Cleaned up some code which was a bit too dense.