Fix use statements and docblocks