Refactor away old-fashioned make syntax