indented mac.cpp and renamed some variables.