Added @category tag. Tighten up formatting