* Added mac generation
* Removed whitespace