Removed unnecessary stuff
Change comments to comply the epydoc