code indentation, comments

short array syntax, spacing, indentation
Merge branch 'cleanup'