cleanup: removed some commented-out code; reformatted; optimized imports. No functional changes.
cleanup: removed some commented-out code; reformatted; optimized imports. No functional changes.

mikedelong/aarhus