More fixing of code smells, related to #146