Commenting, cleanup, etc.
resolve merge