reformatted and fixed make