Commit before merge.
Cleaning up the code.