Refactor make file a bit