update ignores for mac; cleanup formatting