Minor - cleanup