Removed unnecessary imports, removed unnecessary comments, ready for review