Remove duplication
Small cleanups