Took out commented code and added link targets