Cleaning up code and documentation before merging.