slightly cleaner now