small code cleanups
maked attachment name link
review remarks included