reduce repetition, simplify
Merge branch 'simplify-makefile'

Conflicts:
	Makefile