Updated links in method documentation
Removed unnecessary code
Revised code to avoid circular references between packages