Removed obsolte code
Updated documentation to correct style