Code formatting & modified env vars-related behaviour & added Makefile