cleaning up code & doc blocks