Added comments
Cleaned up unused imports