more tweaks for code smells