Refactor style of a bunch of mc session stuff