Added doc blocks
Removed unused imports