Fix nitpicks in spacing