Updated make file to be more automated