clean up lint and fix makefile targets