Updates and improvements to make things simpler and clearer to
understand.