Added Links
Code clean up