Re-order use statements, docblock fixes.