Cleanup, integrate opacity.
More small cleanups.