remove name attribute where not necessary, clean up doc blocks