Fixed namespaces
Removed out-dated comment
Optimized imports