improves pivot api, and readability
improving api