Fix more code smells reported by Landscape.io