Removed unused code
Improved docs