Updated formatting
Added dependency on mach