More formatting and defs