Added mac generation, cleaned whitespace, removed extraneous lines