Adds more dockblocks and minor reformatting