Minor changes to neaten code.