tidy up member code