(#20) Tidying code up.