Cleaned up code and added comments for JWI
Cleaned imports