Tidying up new code to make sure I understand.