More minor changes. Modified style.