Cleaned up more of the design guide