lint + makefile cleanup

[skip ci]