Get rid of globals: optional space