Improved docs and code readability