Removed un-necessary imports and added more explanitory comments