Removed uneeded comments and added some rdocs