Add more clarity to code and usage