Improve make setup