Map link
Code cleaning