Cleaning up a bit of the legacy member class