Some formatting + inconsistency fixes