updated cm and cmp
Update formatting
Merge branch 'feature/aliases' into develop