code simplification & formatting
Merge branch 'beta' into beta-ics