Fixed doc comments
Sorted use statements
Fixed doc comments