cleaned up and updated docblock info