Members controller refactoring