Cleaned up unnecessary imports and added some comments