2.2.4 Pre-release

Code clean up, version bump and beautification.