sort imports according to goimports
cleanup and simplify Makefile