Fix formatting, remove notion of long type.