Some minor re-design.