Fix smells