lint + fix up makefile

[skip ci]