Remove scala. prefix on core types
Minor formatting cleanup