Modifications to formatting etc. suggested by Justin