Changes

Removed some imports

Updated the comments

Moved some variables around