Minor - cleaning code