cleaned up organisation controller