Comments and imports updated
Removed unused code and added semi-colon