Reorganizing Makefile
Removing unnecessary variable
the return construct accept multivalue return