Added links
Indentations fixed
Cleanup