Fix more landscape.io code smells