Arrowhead/mohammad v1

Several changes in this pull request - please excuse all except the arrowhead refactor.
Align the parameters of a method call if they span more than one line.