Fix links to other modules
Simplify code