Refactoring, fog, better aurora