[cluster] Clean up variational

o sort methods alphabetically
o rename self.*expect* -> self.*expectation*