Formatting fixes
Leave assignment up to compiler