Cleanup. Light fix.