Fix smells
Minor code improvements