more code smells fixed.