Currently updating comments for use in godoc documentation.