Cleanup and documentation changes