Cleanup, including comments and documentation