Use global classes without importing them. Also some cosmetic changes.