Improve make