Make it more useable and less verbose