Feature/a in phas a distinct style

I'll commit this and fix the spacing in one shot with a find/replace.