Cleaned up code..

Added/removed link decorations.