Removed commented code and updated documentation