Tweaked use statements and docblocks