simple lint-type fixes
Merge branch 'cleanup' into futurize