Reformat code, reorder annotations
Merge branch 'master' of https://github.com/LapisBlue/Commons