Simplify, refactor, clean.
Build update.
Update version number.