Also cleaned up the comments and the imports slightly. Change-Id: Ieea8af1914ff2f78764d33a9ce6b56621c809fcf