* tidied up code layout.