Code  cleanup