Merge branch `clean-up' into master for synchronization and deploy of prettier code.

Yeah. @btgeek should deploy this, too.