remove comments and refactor link_to