More small changes/cleanup