Removed unnecessary comments and imports