Little refactor in member controllre