improved formatting
Merge branch 'master' of https://github.com/ami-lab/AmI-Platform