Fixing Documentation

+ Fixing documentation and some Code Clean up